projects / babl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: debcade)
declare the test programs used during doc creating as variables to keep
authorMichael Schumacher <schumaml@cvs.gnome.org>
Mon, 22 Jan 2007 00:33:20 +0000 (00:33 +0000)
committerMichael Schumacher <schumaml@src.gnome.org>
Mon, 22 Jan 2007 00:33:20 +0000 (00:33 +0000)
2007-01-22  Michael Schumacher  <schumaml@cvs.gnome.org>

* docs/Makefile.am: declare the test programs used during doc
creating as variables to keep the commands in targets readable.

svn path=/trunk/; revision=199

ChangeLog patch | blob | history
docs/Makefile.am patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 1295af818cb26f34dc5469d33e3e0ea5d148de98..71a443416fd127fd0a716443ea0067d2f0d8e027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-22  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+       * docs/Makefile.am: declare the test programs used during doc
+       creating as variables to keep the commands in targets readable.
+
 2007-01-22  Øyvind Kolås  <pippin@gimp.org>
 
        Applied patch from Tim Mooney fixing bug #392916
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7e3d230920249643fa74e5311415070d7790f31f..011b98513139fd65a1ba168ea7910e12c44cedc1 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,96 +1,99 @@
-.SILENT:
-SUBDIRS=      graphics
-DIST_SUBDIRS= graphics
-
-# The patterns used for html creation in the babl build system
-# is very small, and should probably be documented in a tutorial.
-#      
-#
-#
-HTML_FILES = index-static.html         \
-            index.html         \
-            BablFishPath.html
-
-EXTRA_DIST=                    \
-       .cvsignore              \
-       babl.css                \
-       tools/xml_insert.sh     \
-       tools/changelog2rss     \
-       index-static.html.in    \
-       index.html              \
-       LGPL
-
-BUILT_EXTRA_DIST = index.html BablFishPath.html BablFishPath.txt
-
-CLEANFILES = README changelog.rss
-DISTCLEANFILES = index-static.html
-MAINTAINERCLEANFILES = $(BUILT_EXTRA_DIST)
-
-all: $(HTML_FILES) rss
-
-
-BablFishPath.html: $(top_builddir)/tests/babl_fish_path_dhtml$(EXEEXT)
-       echo -n "HTML:"
-       echo -n " $@"
-       export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\
-       echo " [OK]" || echo " Fail"
-
-BablFishPath.txt: $(top_builddir)/tests/babl_fish_path_fitness$(EXEEXT)
-       echo -n "UTF8:"
-       echo -n " $@"
-       export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\
-       echo " [OK]" || echo " Fail"
-       if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi
-
-index.html: index-static.html                    \
-           $(top_builddir)/tests/babl_html_dump$(EXEEXT) \
-           $(top_srcdir)/AUTHORS                \
-           $(top_srcdir)/NEWS                   \
-           BablFishPath.txt                     \
-           Makefile.am
-       echo -n "HTML: $@"
-       cp $< $@ 
-       (which tempfile > /dev/null&& TMPFILE=`tempfile` || TMPFILE="/tmp/babl_build_tempfile" ;\
-       export BABL_PATH="$(top_builddir)/extensions"; $(top_builddir)/tests/babl_html_dump$(EXEEXT) > $$TMPFILE;\
-       $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\
-       rm -f $$TMPFILE )
-       echo -n "."
-       
-       $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt
-       $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS
-       $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS
-       echo " [OK]"
-
-distclean-local:
-       if test $(srcdir) = .; then :; else     \
-               rm -f $(BUILT_EXTRA_DIST);      \
-       fi
-
-rss: changelog.rss
-
-rss: changelog.rss
-
-changelog.rss: ../ChangeLog
-       echo -n " RSS:"
-       echo -n " $@"
-       tools/changelog2rss $< > $@ && \
-       echo " [OK]" || echo " Fail"
-
-web: all graphics
-       echo -n " WEB: "
-       ping -c 1 $(WEBSITE_HOST) >/dev/null && \
-          (\
-             scp *.txt *.html *.css\
-                 "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/" >/dev/null && \
-                 echo -n "."; \
-             scp graphics/*.png graphics/*.html\
-                 "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/graphics/" >/dev/null\
-               &&\
-                 echo "[OK]"\
-               ||\
-                 echo "FAIL   scp failed (does dirs exist?)."\
-          )\
-       || \
-          (\
-          echo "FAIL   $(WEBSITE_HOST) not reachable."\
-          )
+# programs used for doc creation\r
+babl_fish_path_dhtml   = $(top_builddir)/tests/babl_fish_path_dhtml\r
+babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness\r
+babl_html_dump         = $(top_builddir)/tests/babl_html_dump\r
+\r
+.SILENT:\r
+SUBDIRS=      graphics\r
+DIST_SUBDIRS= graphics\r
+\r
+# The patterns used for html creation in the babl build system\r
+# is very small, and should probably be documented in a tutorial.\r
+#      \r
+#\r
+#\r
+HTML_FILES = index-static.html         \\r
+            index.html         \\r
+            BablFishPath.html\r
+\r
+EXTRA_DIST=                    \\r
+       .cvsignore              \\r
+       babl.css                \\r
+       tools/xml_insert.sh     \\r
+       tools/changelog2rss     \\r
+       index-static.html.in    \\r
+       index.html              \\r
+       LGPL\r
+\r
+BUILT_EXTRA_DIST = index.html BablFishPath.html BablFishPath.txt\r
+\r
+CLEANFILES = README changelog.rss\r
+DISTCLEANFILES = index-static.html\r
+MAINTAINERCLEANFILES = $(BUILT_EXTRA_DIST)\r
+\r
+all: $(HTML_FILES) rss\r
+\r
+\r
+BablFishPath.html: $(babl_fish_path_dhtml)\r
+       echo -n "HTML:"\r
+       echo -n " $@"\r
+       export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\\r
+       echo " [OK]" || echo " Fail"\r
+\r
+BablFishPath.txt: $(babl_fish_path_fitness)\r
+       echo -n "UTF8:"\r
+       echo -n " $@"\r
+       export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\\r
+       echo " [OK]" || echo " Fail"\r
+       if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi\r
+\r
+index.html: index-static.html                    \\r
+           $(babl_html_dump)                    \\r
+           $(top_srcdir)/AUTHORS                \\r
+           $(top_srcdir)/NEWS                   \\r
+           BablFishPath.txt                     \\r
+           Makefile.am\r
+       echo -n "HTML: $@"\r
+       cp $< $@ \r
+       (which tempfile > /dev/null&& TMPFILE=`tempfile` || TMPFILE="/tmp/babl_build_tempfile" ;\\r
+       export BABL_PATH="$(top_builddir)/extensions"; $(babl_html_dump) > $$TMPFILE;\\r
+       $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\\r
+       rm -f $$TMPFILE )\r
+       echo -n "."\r
+\r
+       $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt\r
+       $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS\r
+       $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS\r
+       echo " [OK]"\r
+\r
+distclean-local:\r
+       if test $(srcdir) = .; then :; else     \\r
+               rm -f $(BUILT_EXTRA_DIST);      \\r
+       fi\r
+\r
+rss: changelog.rss\r
+\r
+changelog.rss: ../ChangeLog\r
+       echo -n " RSS:"\r
+       echo -n " $@"\r
+       tools/changelog2rss $< > $@ && \\r
+       echo " [OK]" || echo " Fail"\r
+\r
+web: all graphics\r
+       echo -n " WEB: "\r
+       ping -c 1 $(WEBSITE_HOST) >/dev/null && \\r
+          (\\r
+             scp *.txt *.html *.css\\r
+                 "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/" >/dev/null && \\r
+                 echo -n "."; \\r
+             scp graphics/*.png graphics/*.html\\r
+                 "$(WEBSITE_HOST):$(WEBSITE_LOCATION)/graphics/" >/dev/null\\r
+               &&\\r
+                 echo "[OK]"\\r
+               ||\\r
+                 echo "FAIL   scp failed (does dirs exist?)."\\r
+          )\\r
+       || \\r
+          (\\r
+          echo "FAIL   $(WEBSITE_HOST) not reachable."\\r
+          )\r
Unnamed repository; edit this file 'description' to name the repository.